From: Gert Wollny <gw.fossdev@gmail.com>
Date: Thu, 26 May 2016 15:47:33 +0000 (+0000)
Subject: remove SYSTEM_PROCESSOR related things
X-Git-Tag: archive/raspbian/3.6.9-4+rpi1^2~277
X-Git-Url: https://dgit.raspbian.org/%22http://www.example.com/cgi/success//%22http:/www.example.com/cgi/success/?a=commitdiff_plain;h=081fbc9c627f5f2cd54df4662034eca297f9af9a;p=dcmtk.git

remove SYSTEM_PROCESSOR related things
---

diff --git a/debian/patches/08_remove_system_processor.patch b/debian/patches/08_remove_system_processor.patch
new file mode 100644
index 00000000..49c2892c
--- /dev/null
+++ b/debian/patches/08_remove_system_processor.patch
@@ -0,0 +1,56 @@
+--- a/CMake/GenerateDCMTKConfigure.cmake
++++ b/CMake/GenerateDCMTKConfigure.cmake
+@@ -64,15 +64,6 @@
+ 
+ # Configure file
+ 
+-# Windows being windows, it lies about its processor type to 32 bit binaries
+-SET(SYSTEM_PROCESSOR "$ENV{PROCESSOR_ARCHITEW6432}")
+-IF(NOT SYSTEM_PROCESSOR)
+-  SET(SYSTEM_PROCESSOR "${CMAKE_SYSTEM_PROCESSOR}")
+-ENDIF(NOT SYSTEM_PROCESSOR)
+-# CMake doesn't provide a configure-style system type string
+-SET(CANONICAL_HOST_TYPE "${SYSTEM_PROCESSOR}-${CMAKE_SYSTEM_NAME}")
+-DCMTK_UNSET(SYSTEM_PROCESSOR)
+-
+ # Configure dictionary path and install prefix
+ IF(WIN32 AND NOT CYGWIN AND NOT MINGW)
+   # Set DCMTK_PREFIX needed within some code. Be sure that all / are replaced by \\.
+--- a/CMake/dcmtkPrepare.cmake
++++ b/CMake/dcmtkPrepare.cmake
+@@ -355,11 +355,6 @@
+   OPTION(DCMTK_FORCE_FPIC_ON_UNIX "Add -fPIC compiler flag on unix 64 bit machines to allow linking from dynamic libraries even if DCMTK is built statically" OFF)
+   MARK_AS_ADVANCED(DCMTK_FORCE_FPIC_ON_UNIX)
+ 
+-  # Setting for IA64 / x86_64 which needs -fPIC compiler flag required for shared library build on these platforms
+-  IF(CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND UNIX AND DCMTK_FORCE_FPIC_ON_UNIX)
+-    SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fPIC")
+-    SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fPIC")
+-  ENDIF(CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND UNIX AND DCMTK_FORCE_FPIC_ON_UNIX)
+ 
+ ENDIF(WIN32)
+ 
+--- a/config/include/dcmtk/config/osconfig.h.in
++++ b/config/include/dcmtk/config/osconfig.h.in
+@@ -30,9 +30,6 @@
+ /* Define if __attribute__((aligned)) supports templates */
+ #undef ATTRIBUTE_ALIGNED_SUPPORTS_TEMPLATES
+ 
+-/* Define the canonical host system type as a string constant. */
+-#undef CANONICAL_HOST_TYPE
+-
+ /* Define if char is unsigned on the C compiler */
+ #undef C_CHAR_UNSIGNED
+ 
+--- a/ofstd/libsrc/ofconapp.cc
++++ b/ofstd/libsrc/ofconapp.cc
+@@ -124,6 +124,9 @@
+ 
+ #endif // DCMTK_USE_WCHAR_T
+ 
++#define CANONICAL_HOST_TYPE "Debian"
++
++
+ 
+ void OFConsoleApplication::printHeader(const OFBool hostInfo,
+                                        const OFBool stdError)
diff --git a/debian/patches/series b/debian/patches/series
index 163610f5..c7ae9103 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -5,3 +5,4 @@
 05_performance.patch
 06_soversion_abi.patch
 07_dont_export_all_executables.patch
+08_remove_system_processor.patch